merge trunk
authorK. Handa <handa@gnu.org>
Sun, 16 Jun 2013 08:07:46 +0000 (17:07 +0900)
committerK. Handa <handa@gnu.org>
Sun, 16 Jun 2013 08:07:46 +0000 (17:07 +0900)

Trivial merge